label: Destroy the popup menu on unmap

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 342dadfabd5f2ff59f9fb7fbebd2746b2f34ff73..649ac2c66771349aa5caa7820b527a0b86a9da03 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -4578,7 +4578,15 @@ gtk_label_unmap (GtkWidget *widget)
   GtkLabelPrivate *priv = label->priv;
 
   if (priv->select_info)
-    gdk_window_hide (priv->select_info->window);
+    {
+      gdk_window_hide (priv->select_info->window);
+
+      if (priv->select_info->popup_menu)
+        {
+          gtk_widget_destroy (priv->select_info->popup_menu);
+          priv->select_info->popup_menu = NULL;
+        }
+    }
 
   GTK_WIDGET_CLASS (gtk_label_parent_class)->unmap (widget);
 }